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