Featmerge

client err feat branch merged with recent changes