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