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