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