Merge pull request #8 from smonteleone/WP-1167

Fixes related to vars shared among PM instances