Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'