Merge "Moving skip conditions under skip_check classmethod"