merge all features and improvment

Change-Id: I2264f79566492682dfa77fd60852de032e0b9388
Merge "merge all features and improvment" into development