Still some test fixes about warnings.
Merge branch 'refs/heads/master' into cache_hybrid_strategy