Merge "Disable external ports and update versions"