INT-3230 addressed PR comments