closing merged branch
port-changes-from-branch-2.x.y-to-default
2020-02-03, Gary Kramlich