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