fix alignment issues.
Merge branch 'staging' into 649-refactor_parsing