Merge "Supported data enabled override for different scenarios" into qt-dev