HHH-9543: updated distribution management