460 and authoring
460
Merge remote-tracking branch 'upstream/master'