Fixed in 585791bb36e5770fac003a2f1e422042edf5656b and 01d23f313c777fc30eefc7bc633f99a86e5e1b40