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