Merge branch 'smsc47b397-new-id' into release