merge update-1 into roy