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