Bugfix for TOC 505 parsing
Simplified code for TOC 505 parsing
Merge branch 'development' into release/10