3rd Iteration

Results 162 comments of 3rd Iteration

Are there any that aren't addressed? (In terms of the other PR, I agree that option C makes the most sense) It also gives more scope to make some changes...

> #1967 has been merged, so this can now be rebased to master and the changelog updated. Yep, will do in the next week or two. I'll throw in some...