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