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