Merge branch 'fix/revert-citext-uri' into 'develop'