Merge "Add http_listener input"