Closes #1435 TEST: MDT handler Refs #1433 TEST: AUI usage of API Refs #1437