Merge branch 'work/native-gzip' into devel