backport #1313 which is addition to #1300
Merge pull request #1314 from goodwillcoding/1.5-branch

backport #1313 which is addition to #1300