46549601 fix core api to work with support app