Merge commit '9971e50b694f35fe45c6f903ec56eb9ee47fc477' * commit '9971e50b694f35fe45c6f903ec56eb9ee47fc477': Allow an alternate eri file.