Testing and fixing issues resulting from new async-map implementation
Autocommit Wed Aug 13 07:50:32 EST 2014