Initial commit for v7.0 DEV

Code base is same as master branch commit
75c61b9834827ec49f644127f5f192c0ee6ff1fc