Features/block use callers context

@redross