default placeholders
Merge branch 'placeholders'