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