Merge conflicts totally fixed, rel_recvpkt uncommented and functioning now, though use cases beyond sending ACKs for data packets have not been tested