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