Merge "Allow refresh creator token for edge case" into main