Fix warning in tests.
Avoid warnings of Boost.Preprocessor.
Merge branch 'refs/heads/master' into cache_hybrid_strategy