Merge remote-tracking branch 'public/pr/2146' into development-proposed