Merge branch 'wk/user-manual-literal-format' into maint