More AE-less fixes
Mobilizers persist properly
Merge remote-tracking branch 'origin/master'