cc: @monsieurp
LGTM, please proceed and merge those patches
added 4 commits
Compare with previous version
merged