[fe, runtime] Current changes from work (very very bad commit message:) )