fix for CARBON-14874
Merge changes from isuru udana for pull#42
Merge branch 'isudana-master' for pull#42