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