Merged upstream changes from duet branch