Fixed #21375 -- related_name='+' clashed with other '+' names