Merged branch 'experimental-doubles'.