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