merging dev for new release v1.11.2