Testing and fixing issues resulting from new async-map implementation
Autocommit Wed Aug 13 08:18:57 EST 2014