Merge "Adding metadata for syndic master functionality"