Pulling in mock library conflict fix