[RJA-2907][fix] - Additional cases added