Merge remote-tracking branch 'origin/develop' into feature-rockstore
- moved to new more robust REST calls