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