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