merge (cherrypick last check-in from kill_innerHTML)