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