Merge branch 'feature/remove-old-style-seals'