fixed test after fixing get provider context call in rest client
Merge remote-tracking branch 'origin/develop' into develop