Merge with remote branch development

- Merged with development branch.
- Carried over minor edits (arguments renaming).
- Conflicting .pex recompiled.