merging dev for new release v1.12.4