Following these commits:
After tests these changes are validated. Order 2B is becoming the official Order 2.