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