Merge pull request #5420 from nealef/z13v5