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