Merge "Use store release for resolved types"