TRUNK-3949: Fixing build
(cherry picked from commit 7297fb32adbabf34da94a1305c8029621f5c12a9)