Merge pull request #2413 from fmease/glacier-no-crashes-tests-yes

Merge pull request #2413 from fmease/glacier-no-crashes-tests-yes #4803