Merge "Disable sonar main args for models"