BISERVER-5324 - Piggy packing on this case since this checkin is a
downstream fix