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