Merge "Add disabled check immediately upon package failure"