Merge "Update bluejay SVN to 63" into main