Fix for merge conflict
Merge branch 'inline_entity_tiles' into async_entities