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