Merge "Replace old no-service resource with new one" into qt-r1-dev