Merge branch 'develop' into fix/group-of-issues