PLA-1740

I don't see any tests for this Class.