merge from spark master