Merge "Make security warning on contains() more obvious."