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