David/Nicolas, since this is a regression in 5.1, please make sure it's fixed by 5.1 final (expected to happen in ~5 weeks).