Merge branch 'chores/1691-breaking-change' into 'develop'