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