Merge branch 'RobertSchouten-unclosed_finance1' into develop