Merge branch '2787-closed-loop-management-2' into 'master'

Resolve "closed loop management"

Closes #2787

See merge request !4596
10 jobs for master in 105 minutes and 21 seconds (queued for 2 seconds)