Merge "Increase defensiveness of Incoming Header placement" into rvc-dev