partial work for #2135