About to PR TRN-333, just a few comment updates with this delta.