Merge request.

Most previous commits already applied previously.