interim commit with partial transition to new monitor server support