Merge branch '2833_url_port_in_history' into 4.8.1-stable