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