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