Merge pull request #2037 from atsign-foundation/jt-wp-ss