Merge pull request #14024 from mikedn/long-cast-comm