PLA-897/PLA-897-new/PLA-949  Removed block for "test" only usage