Fixes #7661
Merge pull request #7662 from cvrebert/less-1.4-fixes

Fixes #7661