Cherry Pick commit [BISERVER-11777]