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