bcbb050326
In other words, do not generate p$ fields if we can use L$ fields, which are being cleaned up. #KT-16222 Fixed