Merge pull request #2045 from SpecLad:merge-2.4