production hotfixes post March 5 deployment