Need to grab something from master: TRN-487a.