Comment 5 for bug 1922590

@Al Bailey, please cherrypick your last commit in the clients repo to the r/stx.5.0 release branch once it's open for submissions. I expect the others are already there since they were merged before the branch creation process started.