Merge "Fix NPE in NSSL test" into qt-dev