Developer Update 5

Merge changes from home.