VE-1598: Proper support for alternative rendering