merge from master; make compile