Merge "Handle sigterm signal"