Merge branch 'uncontroversial' into accel