Add moveForwardMode (draft)
Merge branch