WIP: mapping and/or
Merge remote-tracking branch 'refs/remotes/origin/master'
Adding back flattening code.