Merge "Compressed/uncompressed frame header changes." into experimental