Onhangridmaster

Merging the changes on the server side into the masterrequesthandler side.