8 jul feature
disable until upstream is fixed