AUI-1550 - Add additional conditions