Merge "Fixing crash when enforcing top stack."