Merge "fix AAI storage problem"