Merge "Key input consumers by token and not by name" into main