Issue #2279665 by sylus: Fixed CTools Patches for minor bugs committed to dev.