Merge pull request #14225 from nickberry17/update_watchcat_util