Non blocking

NonBlocking branch merge.