HHH-8683 for 4.3