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