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