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