Merge "Add parameter to disable cluster model workarounds" into release/proposed/2019.2.0