Merge branch 'gh96' into 1.6.x
reuse existing groupNamingMappingFile when incremental change is detected
create unit test to prove that problem fixed
fix merge conflicts. Still have to fix some errors before marking merge as completed.