Propagated the changes to branch hari