Update for beta+121-dev