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