Configuration updates for moving to 0.81-RC2