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