fast-forwarding 2.0 to borshop-integration-695-bugfix/clique-git-url = 0562e0ba