Merge "Reduce persist threshold for lower warning/limit." into jb-dev