merge e210k open source (update2 -> update6 patch)