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