reorder close
Revert "Revert "https://issues.jboss.org/browse/JBTM-789""

This reverts commit 3d2eb1ba28faa5b57345734c81d371f062c6d7e5.