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