stacktach updated. Merged with upstream/stable