Merge branch 'master' into parser_enhancement
Added getter for DateId for CONFIRM command

Was forgotten in previous commits.
Merge branch 'parser_enhancement'