Resolved with commit eeb5df32a23ef4dcd3f8b4a5c6097fd70f0aa944 and 8dc20564dfd1a1936529fa0fa076c39d6bcbab60