merge from epoch master