receivefix
Merge branch '2.8' into receivefix
Receive simplified