Merge: Updated for adlink7841