Applied changes identified by jlipford

Git was unable to merge the pull request.  Manually applied changes from
pull request "Synced with 5.22.103 merged source version."