GUAC-630: Backport changes from GUAC-622.