Merge branch 'upstream' into ckermit-212-beta