This is resolved on 5.5.0 but wondering if we want to fix on 5.1.2 as well. Related ticket is MB-29387