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