Fix loading of terra aqua with multiple cores.
Merge commit '6396d2c5b65c95649b44a490eddc27ddd055bf8c' into HEAD