merge from mox235 to fix scripta api