merge from Nova