LPS-47865 Correction of exposed errors