AUI-1462 - these fixes came in pr1