Features [#39518145] and [#40849897]

Reassignment and TBD users.