Fixes issues with certain GDR conformance bitstreams
approved this merge request
enabled an automatic merge when all merge checks for 52274ae0 pass
mentioned in commit 42a062f1
merged