Dev team c merge

Merge dev team C in to DEV branch