Fixes #5544
Merge pull request #5545. Fix #5544
Merge pull request #5545. Fix #5544 in master