Merge docrails in 4-0-stable

/cc @vijaydev @fxn