Merge tag 'v1.0.23' into tizen