Fixed HHH-8270 and HHH-8271