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