Fix examples
Correctly set the destroyed flag
Merge remote-tracking branch upstream/$:{upbranch}