Merge "Remove field not defined in deployment specification"