Receiver number wasn't showing up for DSM (Fix #1641)

Opening a pull request as it's a bit of a mess right now, and I don't understand how you want to handle the parallel work on the not-yet-released 2.0.9 and what's already been commited in next for 2.1.