Backport of 558d1aa from master
Version bump