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