Are these covered by @angus’ latest fix?
I’m about to update my instance to the latest versions to check it out.