Fix: Showing accounting account fails
Merge remote-tracking branch 'Upstream/develop' into develop-accounting