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