Merge "Several preferences lost during P->Q B&R"