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