Merge "Change to choice" into qt-dev