PLA-1763 controller changes