Some update and fix master tree - Update7