local: more 5.0 upgrade patches