Eng 5211 non static hashinator 37

This is for 3.7 release.