* commit 'bdacefba95dcd2680b17120d1721167f5c7990c3': Change FLAG_FORWARD_LOCK back to its original value to not break things.
* commit 'bdacefba95dcd2680b17120d1721167f5c7990c3': Change FLAG_FORWARD_LOCK back to its original value to not break things.