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