This is now supported from rev#70200