merged stuff to RC branch