Resolved conflict after popping stash.
Fixed EngThrustModeRequired to expect the right values_mapping.
Merged.
Resolved conflict.