Final commit for demo 1.1.5-2