beginload, endload
Merge remote-tracking branch 'upstream/redirect' into redirect