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