Merged in Adam's pm-demo-apps changes