Various updates + component placeholder
Merged from develop