Pulled and merged upstream changes