2nd try at fix Issue 12989
fix Issue 13132 - ICE on interface AA key
Merge pull request #3762 from 9rnsr/fix13132

[REG2.066a] Issue 13132 - ICE on interface AA key
Merge pull request #3739 from WalterBright/fix12989-2

2nd try at fix Issue 12989