Issue #25825: Merge $(LIBPL) fix from 3.5