[RJA-2331][fix] - Fix for AD