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