Merge branch 'public/pr/1237' into development