Fix whitespace
Add enrichers
Cleanup
Merge branch '3.7'