recommitting olink's rest fixes
Merge remote branch 'origin/master'