Merge remote-tracking branch 'upstream/master' into admin-side-amends