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