Merge "fix bugs to get `CONSUMER_IP`"