AU Fork - cumulative changes

If you like everything I've done in the individual PRs, you can pull in from this request and get it all at once with conflicts resolved.