Fix meta if AE is missing
Merge remote-tracking branch 'origin/master'