Merge pull request #2095 from atsign-foundation/gkc-pq-b1-split