Fixed giant select in persistence sync.
Merge branch 'stable'