sr-39

Missed a commit in the previous PR.