Merge remote-tracking branch 'origin/develop' into modular
typo fixes
reparse_timer, reorder altered
new-style batch parsing, reparse_timer, comments