Merge "decompressor maintenence" into main