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