SD-834 Needs a change in Server Code as well.