reuse existing groupNamingMappingFile when incremental change is detected
create unit test to prove that problem fixed
Merge branch 'gh97' into 1.6.x