Merge remote-tracking branch 'opf/feature/squashed-migrations' into integration/normalize_acts_as_journalized