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