AUI-1609

Hi Jon, 

This provides the necessary AUI functionality for LPS-49263 to work.