Dhfl demo changes moved to master