Applying our custom scoring mode patch on top of the 0.90.x branch