#3425, #3477 - skin changes