Merge "Update bluejay SVN to 57" into main