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