merge sprint5 into tao