Issue-25-04-22