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