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