Thanks, Ian. Now this is integrated at rev#83715.