Fixing flatMapper again.
Merge branch 'master' into internal
Rename project.
Merge branch 'master' into internal