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