[dali_2.1.31] Merge branch 'devel/master'