Rolling in changes from polarshield.