Sync Aoe_Static with AOEmedia repo