[dali_1.4.37] Merge branch 'devel/master'