Merge "allow re-targetting of surfaces" into kraken