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