Some manual merging done
Brutal bug.
Views don't refresh.
Pre-rollback commit