[PR] Add initial support for dynamic content blocks