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