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