Created by: efritz
Merge details
This PR has been cut up and distributed around the codebase. Carry on.