Correcting issues for core contribution
Fixing merge conflict