Commmittinginto GO1111

Feature changes for GO-1111 that are unite testsdnadskfna;lsdf ;lkdsamlfmasdf