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