Merge "Fixes missing metadata param to controller.yaml"