Fixed build failure for revision r310261