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