Merge tag 'v1.0.24' into tizen