Merge "Replace private attributes with public resources." into sc-dev