[Process] Adjust PR #11264, make it Windows compatible and fix CS