Merge "Fix stacking of rx receive functions"