Reduced memory consumption (Bogdan)

No match.