Merge pull request #395 from gregquat/2.3

Merging manually 2 commits (#387 and #394)
Updating 2.3 with #399