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