Develop

Added harava changes to develop branch.