Merge "Refactoring of simulator toolkit"