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