[dali_1.1.9] Merge branch 'devel/master'