Merge "Diversity extra no longer gets overwritten." into qt-r1-dev