Merge latest from spark:master