HR-152 & HR-220
Merge pull request #53 from HRINY/7.1.4

HR-152 & HR-220