Merge "Make FakeConverter more realistic"