Merge "[DO NOT MERGE] Handle config override via settings correctly - CTS" into qt-dev