Temporary mirror for static analysis fixes from