OC-6048
implementation for skip logic