Merge branch 'noAcceleration'
merged