Improvements from production system for MW 1.19.x