merging dev for new release v2.4.0