Merge "Pass the user and request into BlockManager::getUserBlock"