CONN-560: rework of solution logic, and regression suite.