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