Updated v2.4 release after merging develop