Merge "Defaults for NIM for Q" into qt-dev