Merge branch 'warden-3' into 'master'

Discontinuing Warden2 branch. All hails to the team behind it as it
stood for a defining ground and exploration space for 3rd Warden
incarnation. Kudos and RIP.