Merge shutdown handler to release