Is this commit ok for you ? (it's currently published on for_testrunner_1)
for_testrunner_1
/cc @kazuhiko
