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