(FR #1452) Fix source metadata handling for recurring messages

Change-Id: I599c04835bd0b4335e66faed1c91c5e5dc0a9ab5
Merge remote-tracking branch 'origin/master' into HEAD