Merge a KUAP fix from Nick that we're keeping in a topic branch due to interactions with other series that are headed for next.