Merge "Flag to configure model parameters" into qt-dev