[dali_2.1.2] Merge branch 'devel/master'