merge in from 'beaker' branch