Update master docs

This brings in latest changes from `staging` into `master`