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