Merge "Set 'skin' template parameter rather than override parent method"