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