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