Merge remote-tracking branch 'public/pr/1690' into development