Pie controls
Merge remote-tracking branch 'pa/jellybean' into jellybean
Merging upstream changes