Merge "Check intent creatorToken" into main