merged recent generator changes