Fix merge of metadata from controller

This fixes the merge of metadata that is set from the controller.