Merge branch 'rr1-maint' into rr1-gambatte