Re #1709 Fix failing unit test
Merge branch 'feat/1709-codecleanup' into develop