This should simplify client code significantly according to platform#8849 (closed)
Closes #8800 (closed)