BRANCH 4.3: more alignment issues fixed