Updates (before pull request in Runtime)

@nealstewart