Merge CarbonDev's changes into 'jb3'