Manually merge changes of #411
Manually merge changes of #412
Merge remote-tracking branch 'upstream/2.3' into 2.3
Merge pull request #413 from gregquat/2.3

Updating 2.3