fixes for HR-306
Merge pull request #485 from yashodha/1.2

fixes for HR-306