advancing dev after merging in client and server branches.