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