Merge branch 'refs/heads/2.3/patch-choice' into 2.3/develop