Merge branch 'pv/doc-submodule-update-settings'