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