Merge in changes from r873bf85