Enhancement: Do not overwrite requestId if extra already has one