Merge tag 'v1.0.25' into tizen