Merge branch 'Sats' into DN