PLAT-6840 Replace noCopy() with withValues()