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