Support #532: Demo prepration