Merge "Properly add clientState to secondary fill request" into main