6962082: merge back in lines from bad merge in CR 6501644 and open up a test

Reviewed-by: igor, prr
2 files changed