Merge branch 'master' into develop
Updated to compiler 2.4.0
Release 2.4.0