AI-616 Deal with recent changes