TRUNK-3949: Fixing build