merged with opensource 7100 update1