Merge "RESTRICT AUTOMERGE" into qt-dev