This cannot be merged until the next release (parameters are broken if there is more than one parameter)