Merge pull request #4376 from kumpera/test-hardneing