Rebased
Merge branch 'b.1.0'