#DEMO-42 Committing latest changes