Integrated the Agrabren fixes to Frameworks_AV