Fix bug related to restoring the last solution in case of #findAllSolutions()
Merge branch 'fix-br2fa' into develop