Merging the Contact branches

Merging due to interrelated changes