Merge "Fixed race condition with different profiles" into qt-r1-dev