[US41] Merge fixes from genyd