changes from loxigen e8e6401509