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