Fix FLEX-33643

improved skin class