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