Merge "Adapt to jack api changes"