code rebase, initial commit for 3rd release