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