1.0.4
Merge branch 'release/r2'