Roll in changes from short version