Merge "Add more logging in StagingManager"