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