Merge pull request #538 from tcatm/deprecate-midstate