Merge "Fix issue with wrong token used for input consumer unregistration" into main