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