PA: Merge 20121119