Updated AIP to the one used in 4.0.5