Merge "Add back to greylist" into qt-dev