Merged branch 'persistent-set-space-optimization'.