Merge "Recalculate real caller if caller results in block" into main