Post 1.8.4rc3