avoid-internal-data-leaks

avoid-internal-data-leaks