Merge vendor commits 40c7ff83e7, efec822389, and 2f6c3ea960. Tested by: philip MFC after: 2 months
40c7ff83e7
efec822389
2f6c3ea960