Merge branch 'sb/parse-options-codeformat' into maint