Merge "BUG-650: fix benchmark compilation"