AUI-1091 - initial commit