Nexus 2.8.x nexus 6569 std headers part2

NEXUS-6569: Backport of std hdr fixes, part2
Original PR
#529