Merge "bluejay: Use build_flags for SVN" into main