Pull pstore into release branch