[#48675561] Upgrade wat_catcher and add a config
fix tests