[dali_2.0.53] Merge branch 'devel/master'