Refinement of docs for #4257. Long live the configurator.
Merge branch 'V8_1_5-branch'