Module improvements.
Process / Client parameter improvements.
Merge branch '7.x'
Updated parsing params.