Merge "Fix strategy not used compiler warning"