7.x code review

Merged your code with the latest so it can be merged, code still needs to go through code review.