Merge "Use correct key value" into qt-dev