first checkin for AFFTA-1.3