Merge "Reduce the staleness requirement; make it a flag"