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