Merge branch 'rr/movebug'