Pull apm-freeze-fix into release branch