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