Merge from RestShap Master