Merge "Fix NPE" into qt-dev