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