Merge branch 'hn/submodule-comment'