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