Merge branch '1051-incorrect-complexity-counting-of-certain-if-else-statements-in-the-basop-code' into 'main' Resolve "Incorrect complexity counting of certain IF-ELSE statements in the BASOP code" Closes #1051 See merge request !808