r18031: Merge my replace fixes: