BUG-5280: fix compilation after unrebased merge