Keystone provider fix PRD-1524