Changed PLT to convert Z based on shelf
Merge origin/master