Addressing comments
Updating .iml
Merge branch 'master' into configurationFix
Review request for issue 4362002 for branch configurationFix, commit 708.