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