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