Fix merge of metadata from controller