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