b3124ec2f9
Merge our fixes branch from the 4.18 cycle to resolve some minor conflicts.
Merge our fixes branch from the 4.18 cycle to resolve some minor conflicts.