Merge remote-tracking branch 'rl1987/doc26908'