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