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