This updates the tag but only includes a fix for the port itself. (cherry picked from commit 0e118b00)