Latest CP jar with minor aq related changes