Fix issue with undefined nextPageURL
Merge branch 'release/2.1.1'