Merge "Add parameter to disable cluster model workarounds"