Updates (before pull request in Runtime)

@nealstewart 
It should in that case be a very minimal system since this all doesn't support any old browser to begin with.