change placeholder data
Merge remote-tracking branch 'canon/master'