Updated for rc6.17.0