Opening a pull request for DEMO-16

Mentioning DEMO-15