Issue #2126549 by sylus: Improve Demo Module (1).