Merge pull request #2708 from StevenPuttemans:2.4