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