Small fixes, tidy and shorter lines
merge dev_4_4 -D org -I include -E exclude: PR 523 (Web plugin docs 11559)