antoniop
committed
on 15 Jun 23
Port of downstream fix: variables need to be called differently in the two forms