merge update-1 into jos