AUI-1613

This is an update for AUI-1613.