First commit for develop3 branch

First commit for develop3 branch.