Reopen the code

push to Beta 2.1......some fixes are ready.

go ahead

Change-Id: Iea3fd2b1da8efdafe57715559c36eff9508aca0c