Merge "Several preferences lost during P->Q B&R" into qt-r1-dev