1.4.2 reorg + DocCode test fixes