Merge with master (Need to update Samza and multithreads code according to the new API)