Merged form upstream