tuned generic form
Merge remote-tracking branch 'origin/model_controller_coordination' into model_controller_coordination