Merge "Update AAF loading procedure"