AUI-878

1.0.x