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