Remove a Die, opps
Merge branch 'release/12.0' into develop

* release/12.0:
  Remove a Die, opps