Bump to 2.2.1 + partition layout