Merge: Update legal stuff