[dali_1.4.40] Merge branch 'devel/master'