Ensured setting request for site instances- thanks @tufla
Merge remote-tracking branch 'upstream/master'
Changes after pull request
Merging with original fork