Merge pull request #913 from sylus/feature-wet-v3.1

Last major updates till RC2 released.
Merge pull request #914 from sylus/feature-wet-v3.1

Module updates
Revert extra code

Signed-off-by: Will <sylus1984@gmail.com>