Merged tank changes.