Commit 5cc2e500e6

I commented out the comptime test though since it was causing OOM on the CI server. closes #7331