LOCAL: Merge fixes from 5.1.0