Merge "Add server to clean up even in case of errors"