Merge pull request #3458 from smspillaz/fix-14644-14645