2.4 beta

Merging 2.4-beta into Master now that the resolution issue is resolved.