Fix blueprint instance
Merge remote-tracking branch 'github/katt-version' into katt-version