EMPIREDB-362 RollbackHandler fix and SampleAdv improvement
7 files changed