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