more reorg
checkpoint bug43127
checkpoint: bug43127