Merge "Pass track from meta->message and vice versa"