Based off of !3768 (merged) so diffs there will be seen here until that is merged.
Requires !3768 (merged), but does not have to be merged at the same time.
Christopher Rob Jones authored8d1e5b2d
Christopher Rob Jones authored76322b6e