experimental impl of #695