Merge release 2.4.0+installer into master
Backported release 2.4.0+installer into develop