[dali_2.0.18] Merge branch 'devel/master'