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