Merge branch 'jl/submodule-update-retire-orig-flags'