Merge "Move shelve server logic in compute utility"