Merge "Refactoring skip conditions process"