merging dev for new release v2.5.0