AUI-1463 - these fixes came in pr1