Fix ADHI-4795 and ADHI-4792