bug fix cherry picked into 8.2.2, so the version history item needs to
be placed into the 8.2.2 section.  #4516