Follow-up from "Solutions High Availability page refinement"

The following discussion from !43251 (merged) should be addressed: