Merge remote-tracking branch 'origin' into fix_compiler_warnings_under_split_rend_with_head_rot