Merge "Fix extra specs for share type"