Bump to 2.0.4/8.2.2