AUI-1291 - SF