Merge "Remove recursive rule variable reference" into main