Merged PL changes