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