Platform changes from 7.x

Multiple skins per instance