Merge branch 'pc/submodule-helper'