Merge "Fix lack of share type id in share creation"