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