Add: V2 changes for module versioning

Merged Akshay Bharambe requested to merge ab_v2migration into devbranch