am 55f8209d: Merge "allow re-targetting of surfaces" into kraken