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