Testing and fixing issues resulting from new async-map implementation
Autocommit Tue Aug 12 18:27:32 EST 2014