Merge "DO NOT MERGE Create a single provider of car service" into qt-qpr1-dev