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