Merge 1.9 into 2.0

Contains fix to don't skip relationships in the cache on rollback.