Merged yoihito

Manually merged yoihito's Pandora fixes