port to 70X of #91 

port to 70X of #91