fixes for upgrade HR-195
Merge pull request #209 from yashodha/HR-195

fixes for upgrade HR-195