Merge in our fixes branch. In particular we want to merge the TM and KUAP fixes,
so we can add selftests for them in next.