merge from jedisct1