Caught master up with small changes in imperative branch.