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