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