[mr2861] add some compartibility wrappers
SD2 update
Merge branch 'master' into testing