Repackaged for v7.3
Merge branch 'release/v1.1'