Update to latest changes from Than