CONN-1419 Address review comment on static reference