Merge pull request #1164 from arjantijms/build_24