Turns out that some recent changes made fix to #824 unnecessary. I have removed it and enchanced tests.
Merge branch 'feature/bugfix-#824' into develop