Reverted configuration for demo to master compatible configuration, to be able to merge it into hotfix and master branches.