Removed invalid domain and company name references
merge from master by hand
roll version
merge from develop