Merge "Add two classes to blacklist" into qt-dev