Merge branch 'archive-null-error' into release