Merge branch 'jk/dev-build-format-security' into maint