Q7A does not specify. It’s up to the manufacturer. You will find both of those approaches in
various companies. Some companies do their original retest date from the manufacture date;
some do it from the date of release. You should describe your approach in your procedure.
