Sync Aoe_Profiler with Fabrizio's repo