Post 1.4.1 docs update 1

This should be a docs only update, but the PR #9679, contains a bucket of code too. - #9384 would make this less confusing :/

 #9703 should probably be inculded in this PR too (once its merged)