Merge "Don't throw exception for inflation after removal" into rvc-dev