Manually merging RX buf crash fix from master branch, commit 44e0bd5