Merge pull request #1704 from SpecLad:merge-2.4