Merge "Remove super call in overloaded close()"