Merge branches 'lh/submodules' and 'pb/am'