merge dev_4_4 -D org -I include -E exclude: PR 595 (Web config docs 11723 11724 (rebased onto dev_4_4))
merge dev_4_4 -D org -I include -E exclude: PR 599 (Exchange "Link" for user-friendlier "Mix data" cf. Gus's comment)