Revert "Merge branch 'ab_Release_v2.0.0-alpha' into 'staging'"

Merged Akshay Bharambe requested to merge revert-a82f3023 into staging