(FR #1305) Include source metadata in the queue message

Change-Id: I6e29e0a4e1915110ca29e6591a3ee81516546266
Merge "(FR #1305) Include source metadata in the queue message"