Reworked for 10.2.x through 11.x Changed approach to determining disabled status compared to prev patch; result is the same. Closes #3206944