Hotfix/Workaround for removed nextLink/new change log token