merge dev_5_0 -D org -I include -E exclude: PR 664 (Update 5 docs for release changes )