The first problem should be resolved with changelist 2606511.
I’ll update when the second problem has a solution.