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