#12821 Lockwood

Adjustments