Merge pull request #2098 from atsign-foundation/gkc-pq-is1-simplify