Pull in fix to preserve model collection