Merge "Add timestamps to FMQ ChannelMessage" into main