Merge "Revert "Remove leak detection options""