Fixed in 02c797c2d2cabada43dbab7f3af0e2ad21d41821 and 065d11f7bd1b6a06d5144618efb1e292337d98b8