Merge branch 'destroy' into 'main'

Always use destroy reason NONE in circuit handshake code

Closes #2466

See merge request !4088