@sbhatta can you, please, merge this? I don't have rights to merge to master branch. Olegs
This will create a new commit in order to revert the existing changes.
