BRANCH 4.4: minor alignment fixes
BRANCH 4.4: made project_code override definitions in groups