Merge "RE-APPLY: Use custom metadata object for all logging"