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