CONN-53 subtask CONN-145: WIP - sharing with Landis.