Merge "Fix code architecure in CrudAsyncResponseConsumer"