checkpoint bug43574 and bug43034